bpf: Reject negative head_room in __bpf_skb_change_head #6203
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Author
|
Upstream branch: 881a9c9 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
aebe75f to
40802be
Compare
Author
|
Upstream branch: 7221b9c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1015005=>bpf
branch
from
310e95d to
c151b88
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
40802be to
fac0704
Compare
Author
|
Upstream branch: 7221b9c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1015005=>bpf
branch
from
c151b88 to
bf46b40
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
fac0704 to
2bc34d4
Compare
Author
|
Upstream branch: 7221b9c |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1015005=>bpf
branch
from
bf46b40 to
96daafa
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
2bc34d4 to
7c8a49d
Compare
Author
|
Upstream branch: 8ce93aa |
Yinhao et al. recently reported: Our fuzzing tool was able to create a BPF program which triggered the below BUG condition inside pskb_expand_head. [ 23.016047][T10006] kernel BUG at net/core/skbuff.c:2232! [...] [ 23.017301][T10006] RIP: 0010:pskb_expand_head+0x1519/0x1530 [...] [ 23.021249][T10006] Call Trace: [ 23.021387][T10006] <TASK> [ 23.021507][T10006] ? __pfx_pskb_expand_head+0x10/0x10 [ 23.021725][T10006] __bpf_skb_change_head+0x22a/0x520 [ 23.021939][T10006] bpf_skb_change_head+0x34/0x1b0 [ 23.022143][T10006] ___bpf_prog_run+0xf70/0xb670 [ 23.022342][T10006] __bpf_prog_run32+0xed/0x140 [...] The problem is that in __bpf_skb_change_head() we need to reject a negative head_room as otherwise this propagates all the way to the pskb_expand_head() from skb_cow(). For example, if the BPF test infra passes a skb with gso_skb:1 to the BPF helper with a negative head_room of -22, then this gets passed into skb_cow(). __skb_cow() in this example calculates a delta of -86 which gets aligned to -64, and then triggers BUG_ON(nhead < 0). Thus, reject malformed negative input. Fixes: 3a0af8f ("bpf: BPF for lightweight tunnel infrastructure") Reported-by: Yinhao Hu <[email protected]> Reported-by: Kaiyan Mei <[email protected]> Reviewed-by: Dongliang Mu <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]>
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/1015005=>bpf
branch
from
96daafa to
b8fe094
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
7c8a49d to
6593a90
Compare
Author
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=1015005 irrelevant now. Closing PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: bpf: Reject negative head_room in __bpf_skb_change_head
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=1015005